fix(clerk-js): Remove setActive() call from signOut() #5171

brkalow · 2025-02-14T20:34:19Z

Description

Removes setActive() call from signOut() implementation, fixing a number of bugs related to sign out.

Checklist

pnpm test runs as expected.
pnpm build runs as expected.
(If applicable) JSDoc comments have been added or updated for any package exports
(If applicable) Documentation has been updated

Type of change

changeset-bot · 2025-02-14T20:34:24Z

🦋 Changeset detected

Latest commit: 78dc840

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages

Name	Type
@clerk/clerk-js	Patch
@clerk/chrome-extension	Patch
@clerk/clerk-expo	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel · 2025-02-14T20:34:25Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
clerk-js-sandbox	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 25, 2025 9:25pm

# Conflicts: # packages/clerk-js/src/core/clerk.ts

panteliselef · 2025-02-19T13:56:43Z

!snapshot

panteliselef · 2025-02-19T14:00:56Z

!snapshot

clerk-cookie · 2025-02-19T14:03:29Z

Hey @panteliselef - the snapshot version command generated the following package versions:

Package	Version
@clerk/agent-toolkit	0.0.4-snapshot.v20250219140158
@clerk/astro	2.3.0-snapshot.v20250219140158
@clerk/backend	1.24.3-snapshot.v20250219140158
@clerk/chrome-extension	2.2.11-snapshot.v20250219140158
@clerk/clerk-js	5.54.0-snapshot.v20250219140158
@clerk/elements	0.23.0-snapshot.v20250219140158
@clerk/clerk-expo	2.8.0-snapshot.v20250219140158
@clerk/expo-passkeys	0.1.22-snapshot.v20250219140158
@clerk/express	1.3.50-snapshot.v20250219140158
@clerk/fastify	2.1.23-snapshot.v20250219140158
@clerk/localizations	3.10.8-snapshot.v20250219140158
@clerk/nextjs	6.12.1-snapshot.v20250219140158
@clerk/nuxt	1.2.1-snapshot.v20250219140158
@clerk/clerk-react	5.24.0-snapshot.v20250219140158
@clerk/react-router	1.1.1-snapshot.v20250219140158
@clerk/remix	4.5.1-snapshot.v20250219140158
@clerk/shared	2.23.0-snapshot.v20250219140158
@clerk/tanstack-start	0.10.1-snapshot.v20250219140158
@clerk/testing	1.4.24-snapshot.v20250219140158
@clerk/themes	2.2.20-snapshot.v20250219140158
@clerk/types	4.47.0-snapshot.v20250219140158
@clerk/ui	0.3.25-snapshot.v20250219140158
@clerk/vue	1.3.0-snapshot.v20250219140158

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/agent-toolkit

npm i @clerk/[email protected] --save-exact

@clerk/astro

npm i @clerk/[email protected] --save-exact

@clerk/backend

npm i @clerk/[email protected] --save-exact

@clerk/chrome-extension

npm i @clerk/[email protected] --save-exact

@clerk/clerk-js

npm i @clerk/[email protected] --save-exact

@clerk/elements

npm i @clerk/[email protected] --save-exact

@clerk/clerk-expo

npm i @clerk/[email protected] --save-exact

@clerk/expo-passkeys

npm i @clerk/[email protected] --save-exact

@clerk/express

npm i @clerk/[email protected] --save-exact

@clerk/fastify

npm i @clerk/[email protected] --save-exact

@clerk/localizations

npm i @clerk/[email protected] --save-exact

@clerk/nextjs

npm i @clerk/[email protected] --save-exact

@clerk/nuxt

npm i @clerk/[email protected] --save-exact

@clerk/clerk-react

npm i @clerk/[email protected] --save-exact

@clerk/react-router

npm i @clerk/[email protected] --save-exact

@clerk/remix

npm i @clerk/[email protected] --save-exact

@clerk/shared

npm i @clerk/[email protected] --save-exact

@clerk/tanstack-start

npm i @clerk/[email protected] --save-exact

@clerk/testing

npm i @clerk/[email protected] --save-exact

@clerk/themes

npm i @clerk/[email protected] --save-exact

@clerk/types

npm i @clerk/[email protected] --save-exact

@clerk/ui

npm i @clerk/[email protected] --save-exact

@clerk/vue

npm i @clerk/[email protected] --save-exact

panteliselef · 2025-02-20T11:10:09Z

!snapshot

clerk-cookie · 2025-02-20T11:12:27Z

Hey @panteliselef - the snapshot version command generated the following package versions:

Package	Version
@clerk/agent-toolkit	0.0.4-snapshot.v20250220111059
@clerk/astro	2.3.0-snapshot.v20250220111059
@clerk/backend	1.24.3-snapshot.v20250220111059
@clerk/chrome-extension	2.2.11-snapshot.v20250220111059
@clerk/clerk-js	5.54.0-snapshot.v20250220111059
@clerk/elements	0.23.0-snapshot.v20250220111059
@clerk/clerk-expo	2.8.0-snapshot.v20250220111059
@clerk/expo-passkeys	0.1.22-snapshot.v20250220111059
@clerk/express	1.3.50-snapshot.v20250220111059
@clerk/fastify	2.1.23-snapshot.v20250220111059
@clerk/localizations	3.10.8-snapshot.v20250220111059
@clerk/nextjs	6.12.1-snapshot.v20250220111059
@clerk/nuxt	1.2.1-snapshot.v20250220111059
@clerk/clerk-react	5.24.0-snapshot.v20250220111059
@clerk/react-router	1.1.1-snapshot.v20250220111059
@clerk/remix	4.5.1-snapshot.v20250220111059
@clerk/shared	2.23.0-snapshot.v20250220111059
@clerk/tanstack-start	0.10.1-snapshot.v20250220111059
@clerk/testing	1.4.24-snapshot.v20250220111059
@clerk/themes	2.2.20-snapshot.v20250220111059
@clerk/types	4.47.0-snapshot.v20250220111059
@clerk/ui	0.3.25-snapshot.v20250220111059
@clerk/vue	1.3.0-snapshot.v20250220111059

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/agent-toolkit

npm i @clerk/[email protected] --save-exact

@clerk/astro

npm i @clerk/[email protected] --save-exact

@clerk/backend

npm i @clerk/[email protected] --save-exact

@clerk/chrome-extension

npm i @clerk/[email protected] --save-exact

@clerk/clerk-js

npm i @clerk/[email protected] --save-exact

@clerk/elements

npm i @clerk/[email protected] --save-exact

@clerk/clerk-expo

npm i @clerk/[email protected] --save-exact

@clerk/expo-passkeys

npm i @clerk/[email protected] --save-exact

@clerk/express

npm i @clerk/[email protected] --save-exact

@clerk/fastify

npm i @clerk/[email protected] --save-exact

@clerk/localizations

npm i @clerk/[email protected] --save-exact

@clerk/nextjs

npm i @clerk/[email protected] --save-exact

@clerk/nuxt

npm i @clerk/[email protected] --save-exact

@clerk/clerk-react

npm i @clerk/[email protected] --save-exact

@clerk/react-router

npm i @clerk/[email protected] --save-exact

@clerk/remix

npm i @clerk/[email protected] --save-exact

@clerk/shared

npm i @clerk/[email protected] --save-exact

@clerk/tanstack-start

npm i @clerk/[email protected] --save-exact

@clerk/testing

npm i @clerk/[email protected] --save-exact

@clerk/themes

npm i @clerk/[email protected] --save-exact

@clerk/types

npm i @clerk/[email protected] --save-exact

@clerk/ui

npm i @clerk/[email protected] --save-exact

@clerk/vue

npm i @clerk/[email protected] --save-exact

This reverts commit e2d9d6f.

panteliselef · 2025-02-24T17:15:17Z

!snapshot

clerk-cookie · 2025-02-24T17:17:18Z

Hey @panteliselef - the snapshot version command generated the following package versions:

Package	Version
@clerk/agent-toolkit	0.0.4-snapshot.v20250224171551
@clerk/astro	2.3.0-snapshot.v20250224171551
@clerk/backend	1.24.3-snapshot.v20250224171551
@clerk/chrome-extension	2.2.11-snapshot.v20250224171551
@clerk/clerk-js	5.54.0-snapshot.v20250224171551
@clerk/elements	0.23.0-snapshot.v20250224171551
@clerk/clerk-expo	2.8.0-snapshot.v20250224171551
@clerk/expo-passkeys	0.1.22-snapshot.v20250224171551
@clerk/express	1.3.50-snapshot.v20250224171551
@clerk/fastify	2.1.23-snapshot.v20250224171551
@clerk/localizations	3.10.8-snapshot.v20250224171551
@clerk/nextjs	6.12.1-snapshot.v20250224171551
@clerk/nuxt	1.2.1-snapshot.v20250224171551
@clerk/clerk-react	5.24.0-snapshot.v20250224171551
@clerk/react-router	1.1.1-snapshot.v20250224171551
@clerk/remix	4.5.1-snapshot.v20250224171551
@clerk/shared	2.23.0-snapshot.v20250224171551
@clerk/tanstack-start	0.10.1-snapshot.v20250224171551
@clerk/testing	1.4.24-snapshot.v20250224171551
@clerk/themes	2.2.20-snapshot.v20250224171551
@clerk/types	4.47.0-snapshot.v20250224171551
@clerk/ui	0.3.25-snapshot.v20250224171551
@clerk/vue	1.3.0-snapshot.v20250224171551

Tip: Use the snippet copy button below to quickly install the required packages.
@clerk/agent-toolkit

npm i @clerk/[email protected] --save-exact

@clerk/astro

npm i @clerk/[email protected] --save-exact

@clerk/backend

npm i @clerk/[email protected] --save-exact

@clerk/chrome-extension

npm i @clerk/[email protected] --save-exact

@clerk/clerk-js

npm i @clerk/[email protected] --save-exact

@clerk/elements

npm i @clerk/[email protected] --save-exact

@clerk/clerk-expo

npm i @clerk/[email protected] --save-exact

@clerk/expo-passkeys

npm i @clerk/[email protected] --save-exact

@clerk/express

npm i @clerk/[email protected] --save-exact

@clerk/fastify

npm i @clerk/[email protected] --save-exact

@clerk/localizations

npm i @clerk/[email protected] --save-exact

@clerk/nextjs

npm i @clerk/[email protected] --save-exact

@clerk/nuxt

npm i @clerk/[email protected] --save-exact

@clerk/clerk-react

npm i @clerk/[email protected] --save-exact

@clerk/react-router

npm i @clerk/[email protected] --save-exact

@clerk/remix

npm i @clerk/[email protected] --save-exact

@clerk/shared

npm i @clerk/[email protected] --save-exact

@clerk/tanstack-start

npm i @clerk/[email protected] --save-exact

@clerk/testing

npm i @clerk/[email protected] --save-exact

@clerk/themes

npm i @clerk/[email protected] --save-exact

@clerk/types

npm i @clerk/[email protected] --save-exact

@clerk/ui

npm i @clerk/[email protected] --save-exact

@clerk/vue

npm i @clerk/[email protected] --save-exact

panteliselef · 2025-02-25T14:03:54Z

packages/clerk-js/src/core/clerk.ts

+     * Clears the router cache for `@clerk/nextjs` on all routes except the current one.
+     * Note: Calling `onBeforeSetActive` before signing out, allows for new RSC prefetch requests to render as signed in.
+     */
+    await onBeforeSetActive();


Notice that we call onBeforeSetActive twice

panteliselef · 2025-02-25T14:04:29Z

packages/clerk-js/src/core/clerk.ts

+    /**
+     * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
+     */
+    await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);


We need to support the case of User.delete and the setActive({session:null})

panteliselef · 2025-02-25T14:05:36Z

packages/nextjs/src/app-router/client/ClerkProvider.tsx

          startTransition(() => {
            router.refresh();
          });
+        } else if (nextVersion.startsWith('15') && intent === 'sign-out') {


On next 15 we still want to fire the server action when setting a session or when selecting an organization.

Remove setActive() call from signOut()

70a7429

vercel bot deployed to Preview February 14, 2025 20:34 View deployment

clerk-cookie added the clerk-js label Feb 14, 2025

Remove unnecessary usage of onBeforeSetActive(), refactor shared logic

6fff5bc

vercel bot deployed to Preview February 17, 2025 21:17 View deployment

Updates unit tests

4032148

vercel bot deployed to Preview February 17, 2025 21:46 View deployment

adds changeset

5260348

vercel bot deployed to Preview February 17, 2025 21:58 View deployment

handle transitive state

b9d496e

vercel bot deployed to Preview February 17, 2025 23:21 View deployment

remove duplicated type

ea3bf5e

vercel bot deployed to Preview February 17, 2025 23:23 View deployment

move onBeforeSetActive() to run before we remove the session

5172ee6

vercel bot deployed to Preview February 18, 2025 17:19 View deployment

Merge branch 'main' into brk.feat/sign-out-no-set-active

e3af753

brkalow requested a review from a team February 18, 2025 23:31

brkalow marked this pull request as ready for review February 18, 2025 23:31

vercel bot deployed to Preview February 18, 2025 23:33 View deployment

Replace activeSessions with signedInSessions

a6b4789

vercel bot deployed to Preview February 19, 2025 01:50 View deployment

formatting

bb63e4e

vercel bot deployed to Preview February 19, 2025 01:55 View deployment

panteliselef added 2 commits February 19, 2025 14:46

Merge branch 'refs/heads/main' into brk.feat/sign-out-no-set-active

0bc89cc

# Conflicts: # packages/clerk-js/src/core/clerk.ts

improve unload tracker

ccd7847

vercel bot deployed to Preview February 19, 2025 13:38 View deployment

Remove early onBeforeSetActive on sign out

e2d9d6f

vercel bot deployed to Preview February 20, 2025 10:44 View deployment

Merge branch 'refs/heads/main' into brk.feat/sign-out-no-set-active

8805538

vercel bot deployed to Preview February 20, 2025 11:53 View deployment

Revert "Remove early onBeforeSetActive on sign out"

5e690cc

This reverts commit e2d9d6f.

vercel bot deployed to Preview February 20, 2025 15:28 View deployment

Allow for onBeforeSetActive after removeSessions

d35bf14

clerk-cookie added the nextjs label Feb 24, 2025

vercel bot deployed to Preview February 24, 2025 17:13 View deployment

properly call onBeforeSetActive with intent

77339d7

vercel bot deployed to Preview February 25, 2025 14:03 View deployment

panteliselef reviewed Feb 25, 2025

View reviewed changes

Merge branch 'main' into brk.feat/sign-out-no-set-active

78dc840

vercel bot deployed to Preview February 25, 2025 21:25 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(clerk-js): Remove setActive() call from signOut() #5171

fix(clerk-js): Remove setActive() call from signOut() #5171

brkalow commented Feb 14, 2025

changeset-bot bot commented Feb 14, 2025 •

edited

Loading

vercel bot commented Feb 14, 2025 •

edited

Loading

panteliselef commented Feb 19, 2025

panteliselef commented Feb 19, 2025

clerk-cookie commented Feb 19, 2025

panteliselef commented Feb 20, 2025

clerk-cookie commented Feb 20, 2025

panteliselef commented Feb 24, 2025

clerk-cookie commented Feb 24, 2025

panteliselef Feb 25, 2025

panteliselef Feb 25, 2025

panteliselef Feb 25, 2025

fix(clerk-js): Remove setActive() call from signOut() #5171

Are you sure you want to change the base?

fix(clerk-js): Remove setActive() call from signOut() #5171

Conversation

brkalow commented Feb 14, 2025

Description

Checklist

Type of change

changeset-bot bot commented Feb 14, 2025 • edited Loading

🦋 Changeset detected

vercel bot commented Feb 14, 2025 • edited Loading

panteliselef commented Feb 19, 2025

panteliselef commented Feb 19, 2025

clerk-cookie commented Feb 19, 2025

panteliselef commented Feb 20, 2025

clerk-cookie commented Feb 20, 2025

panteliselef commented Feb 24, 2025

clerk-cookie commented Feb 24, 2025

panteliselef Feb 25, 2025

Choose a reason for hiding this comment

panteliselef Feb 25, 2025

Choose a reason for hiding this comment

panteliselef Feb 25, 2025

Choose a reason for hiding this comment

changeset-bot bot commented Feb 14, 2025 •

edited

Loading

vercel bot commented Feb 14, 2025 •

edited

Loading